Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update TiUP offline deployment; rename tiup mirrors to tiup mirror #3425

Merged
merged 13 commits into from
Jun 2, 2020

Conversation

lichunzhu
Copy link
Contributor

@lichunzhu lichunzhu commented Jun 1, 2020

What is changed, added or deleted? (Required)

  1. Update TiUP offline deployment method.
  2. rename tiup mirrors -> tiup mirror
  3. 现在 tiup 从 pingcap-incubar 移到了 pingcap,tiup-cluster 合入了 tiup repo,更新了一下 link。离线包会更新包名
  4. 把 tiup-package 删掉了,我们以后不需要这个组件了

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

@lichunzhu lichunzhu requested a review from lonng June 1, 2020 04:02
@lichunzhu lichunzhu requested a review from yikeke June 1, 2020 05:11
Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM

@@ -224,7 +224,7 @@ alertmanager_servers:

## 6. 部署 TiDB 集群

`/path/to/mirror` 是 `tiup mirrors <target-dir>` 中输出的 package 所在离线机器的位置:
`/path/to/mirror` 是执行 `local_install.sh` 提示中输出的离线镜像包的位置:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
`/path/to/mirror` 是执行 `local_install.sh` 提示中输出的离线镜像包的位置:
`/path/to/mirror` 是执行 `local_install.sh` 命令时输出的离线镜像包的位置:

@yikeke yikeke added needs-cherry-pick-4.0 translation/doing This PR’s assignee is translating this PR. labels Jun 1, 2020
@yikeke yikeke assigned 3pointer and ran-huang and unassigned 3pointer Jun 1, 2020
@lichunzhu
Copy link
Contributor Author

DNM now, I have some other documents to update.

@@ -44,7 +44,7 @@ category: how-to
{{< copyable "shell-regular" >}}

```bash
tiup mirrors package --os=linux v4.0.0
tiup mirror clone package v4.0.0 --os=linux --arch=amd64
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

或者引导到官方下载页面直接下载离线包,可以给两个选项。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的

---
title: 搭建私有镜像
category: tools
aliases: ['/docs-cn/dev/reference/tools/tiup/mirror/']
Copy link
Contributor

@yikeke yikeke Jun 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
aliases: ['/docs-cn/dev/reference/tools/tiup/mirror/']
aliases: ['/docs-cn/dev/tiup/tiup-mirrors/','/docs-cn/dev/reference/tools/tiup/mirror/']

文件改名涉及url的变动,需要加个新 alias

@yikeke yikeke changed the title update TiUP offline deployment update TiUP offline deployment; rename tiup mirrors to tiup mirror Jun 1, 2020
@yikeke yikeke self-assigned this Jun 1, 2020
@yikeke
Copy link
Contributor

yikeke commented Jun 1, 2020

tiup mirrors 组件是改名成 tiup mirror 了吗? @lichunzhu @lonng

搜了下全站的文档,发现还有几处用的是 tiup mirrors:

如果组件改名了,那么 url、变量名是否也需要相应更新下?

@lichunzhu
Copy link
Contributor Author

tiup mirrors 组件是改名成 tiup mirror 了吗? @lichunzhu @lonng

搜了下全站的文档,发现还有几处用的是 tiup mirrors:

如果组件改名了,那么 url、变量名是否也需要相应更新下?

这几个不影响,tiup mirrors 弃用了,改成 tiup mirror

@yikeke
Copy link
Contributor

yikeke commented Jun 1, 2020

tiup mirrors 组件是改名成 tiup mirror 了吗? @lichunzhu @lonng
搜了下全站的文档,发现还有几处用的是 tiup mirrors:

如果组件改名了,那么 url、变量名是否也需要相应更新下?

这几个不影响,tiup mirrors 弃用了,改成 tiup mirror

ok, @lichunzhu 更新完了吗?ready for review 了麻烦 at 我下

Comment on lines 19 to 20
wget https://download.pingcap.org/xxx.tar.gz
mv xxx.tar.gz package.tar.gz
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

等上传包后,我会更新这里,然后再合 PR

@lichunzhu
Copy link
Contributor Author

tiup mirrors 组件是改名成 tiup mirror 了吗? @lichunzhu @lonng
搜了下全站的文档,发现还有几处用的是 tiup mirrors:

如果组件改名了,那么 url、变量名是否也需要相应更新下?

这几个不影响,tiup mirrors 弃用了,改成 tiup mirror

ok, @lichunzhu 更新完了吗?ready for review 了麻烦 at 我下

@yikeke 可以看了,现在 tiup 从 pingcap-incubar 移到了 pingcap,tiup-cluster 合入了 tiup repo,更新了一下 link。离线包这里我会在上传包后更新包名


### 使用 TiUP 离线安装 TiDB 集群

以在隔离的环境中安装一个 v4.0.0-rc 的 TiDB 集群为例,可以执行以下步骤:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

使用 v4.0.0,引导用户用最新的版本

@@ -66,7 +66,7 @@ Flags:

环境变量 `TIUP_COMPONENT_INSTALL_DIR` 会由 TiUP 在运行时传入,指向该组件的安装目录。

3. 参考[搭建私有镜像](/tiup/tiup-mirrors.md) 搭建离线镜像或私有镜像(因为目前官方镜像未开放 publish 功能,所以不能发布自己的包),搭建完之后确保 `TIUP_MIRRORS` 变量指向搭建的镜像。
3. 参考[搭建私有镜像](/tiup/tiup-mirror.md) 搭建离线镜像或私有镜像(因为目前官方镜像未开放 publish 功能,所以不能发布自己的包),搭建完之后确保 `TIUP_MIRRORS` 变量指向搭建的镜像。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以把 tiup-package 删掉了,我们以后不需要这个组件了。

Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM


### 使用 TiUP 离线安装 TiDB 集群

这里可以参考[使用 TiUP 离线部署](/production-offline-deployment-using-tiup.md)安装 TiUP 离线镜像,部署并启动 TiDB 集群。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
这里可以参考[使用 TiUP 离线部署](/production-offline-deployment-using-tiup.md)安装 TiUP 离线镜像,部署并启动 TiDB 集群。
参考[使用 TiUP 离线部署](/production-offline-deployment-using-tiup.md#方式二使用-tiup-mirror-clone-命令手动打包离线组件包)安装 TiUP 离线镜像,部署并启动 TiDB 集群。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed in 637b6e6

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ready for merge now

@yikeke yikeke added status/LGT2 Indicates that a PR has LGTM 2. and removed status/PTAL This PR is ready for reviewing. labels Jun 2, 2020
@yikeke
Copy link
Contributor

yikeke commented Jun 2, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 2, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Jun 2, 2020

/run-all-tests

@sre-bot sre-bot merged commit 6179cce into pingcap:master Jun 2, 2020
sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request Jun 2, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Jun 2, 2020

cherry pick to release-4.0 in PR #3455

@lichunzhu lichunzhu deleted the updateTiUPOfflineDeployment branch June 2, 2020 09:09
yikeke pushed a commit to yikeke/docs that referenced this pull request Jun 5, 2020
sre-bot added a commit to pingcap/docs that referenced this pull request Jun 9, 2020
@yikeke yikeke added the size/small Changes of a small size. label Jun 19, 2020
@yikeke yikeke added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Jun 28, 2020
yikeke pushed a commit to pingcap/docs that referenced this pull request Jun 28, 2020
yikeke added a commit to pingcap/docs that referenced this pull request Jul 1, 2020
* create and rename file; update TOC and docs guide

* align the rest of pingcap/docs-cn#3197

* Update TOC.md

* add an alias

* align https://github.com/pingcap/docs-cn/pull/3417/files

* align pingcap/docs-cn#3463 and pingcap/docs-cn#3425

* update aliases

* Apply suggestions from code review

Co-authored-by: TomShawn <[email protected]>

* add summary and update format

* Apply suggestions from code review

Co-authored-by: TomShawn <[email protected]>

* Update tiup/tiup-component-management.md

Co-authored-by: TomShawn <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants